Skip to content

Conversation

@wilsonge
Copy link
Contributor

  • Merge with a merge not a squash/rebase

HLeithner and others added 30 commits June 11, 2019 22:39
* Media field style and layout

* Small screen considerations

* Tweaks

* Revert js change

* indent

* Fix scroll in chrome
Chosen is not accessible so we shouldnt use it unless it offers something useful.

In the search component in the front end there are potentially two lists Ordering and display #

Neither of these require or benefit from chosen so this simple PR returns them to regular and accessible lists
The $key parameter can be either an array or a string but from PHPDoc it was only an array
* Improvements to mediamanager.js and popup-imagemanager.js
 - use jquery's prop function instead of attr
 - properly and consistently encode and decode URI components
 - explicitly use global variables from the global scope

* Wait till the iframe is loaded before doing things that required the iframe to be loaded.
@joomla-cms-bot joomla-cms-bot added NPM Resource Changed This Pull Request can't be tested by Patchtester PR-4.0-dev labels Aug 31, 2019
@wilsonge wilsonge merged commit e1bc1ef into joomla:4.0-dev Aug 31, 2019
@wilsonge
Copy link
Contributor Author

wilsonge commented Aug 31, 2019

Known failure case trying to login into the admin site. So choosing to merge this with the failing test. Tests passed in mysql suggesting that the system tests are largely working and the only postgres changes here relate to template styles

EDIT: PostgreSQL passed on the merge commit drone run - so this was indeed just a blip

@wilsonge wilsonge deleted the 3910-merge branch August 31, 2019 23:05
name="fieldfilter"
type="list"
label="PLG_FIELDS_TEXT_PARAMS_FILTER_LABEL"
description="PLG_FIELDS_TEXT_PARAMS_FILTER_DESC"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this language string is not present in j4 because we removed the usage of the description

@brianteeman
Copy link
Contributor

you merged as I was typing an issue. do you want me to submit a pr or will you add to the commit

@wilsonge
Copy link
Contributor Author

wilsonge commented Sep 1, 2019

Sorry - can you do a PR please. Just saw this and about to head to bed.

@brianteeman
Copy link
Contributor

done #26112

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

NPM Resource Changed This Pull Request can't be tested by Patchtester

Projects

None yet

Development

Successfully merging this pull request may close these issues.